Auto merge of #4107 - alexcrichton:update-deps, r=alexcrichton
authorbors <bors@rust-lang.org>
Sun, 28 May 2017 01:02:13 +0000 (01:02 +0000)
committerbors <bors@rust-lang.org>
Sun, 28 May 2017 01:02:13 +0000 (01:02 +0000)
Update a slew of dependencies and such

Standard bug fixes and otherwise keeping up to date

1  2 
tests/build.rs

diff --cc tests/build.rs
Simple merge